Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upstream Merge 6/7/2024 #20

Merged
merged 52 commits into from
Jun 8, 2024
Merged

Upstream Merge 6/7/2024 #20

merged 52 commits into from
Jun 8, 2024

Conversation

VMSolidus
Copy link
Contributor

Don't read this please, there's meant to be a surprise here for the players. <3

VMSolidus and others added 30 commits May 5, 2024 03:19
@VMSolidus
Sleep deprived coding
5b8d8bd
@VMSolidus
guhh
c964f91
@VMSolidus
updating mimic rule
84afa69
@VMSolidus
update mimic spawns
7126614
@VMSolidus
Guh
dcbb94d
@VMSolidus
Update submarine
3a1bf4a
@VMSolidus
rsi validator
f293866
@VMSolidus
Revert "rsi validator"
2291292 
This reverts commit f293866.
@VMSolidus
guhhhhh
e5b5765
@VMSolidus
Update vending_machines.yml
bbc73ed
@VMSolidus
Update vending_machines.yml
9e6c56c
@VMSolidus
Update vending_machines.yml
35204d3
@VMSolidus
Update vending_machines.yml
e1e7d1f
@VMSolidus
Update vending_machines.yml
bcbe1ad
@VMSolidus
Update vending_machines.yml
7f1f618
@VMSolidus
found it
7fdfea5
@VMSolidus
Fuck the test
01186cf
@VMSolidus
Update bay12barbershop.yml
8455835
@VMSolidus
Update vending_machines.yml
f9c509a
@VMSolidus
more point lights
6458ed0
@VMSolidus
More work on shader
1d2bd21
@VMSolidus
update cola and coffee
1925472
@VMSolidus
engivend done
f27b719
@Pspritechologist
Chunk of sprites adjusted. Some may be slightly misaligned :)
e8fc219
@VMSolidus
Merge branch 'master' into Vendors
d5afb68
@VMSolidus
wallmed done
0f4cecf
@VMSolidus
guh
9122ae1
@VMSolidus
FINALLY DONE
65a58f4
@VMSolidus
Merge branch 'master' into FIX-MIMICS
386057a
@DangerRevolution
Merge branch 'master' into Additional-Loadout-Items
8033d02
VMSolidus and others added 16 commits May 31, 2024 15:38
@VMSolidus
YE
770a2b0
@VMSolidus
Merge branch 'master' into Additional-Loadout-Items
0edd396 
Signed-off-by: VMSolidus <[email protected]>
@VMSolidus
Update ciggy discreption
8375afc
@VMSolidus
Update packs.yml
6ca58bf
@VMSolidus
Update outerClothing.yml
f24dcfe
@VMSolidus
update categories
c588ac5
@VMSolidus
Add bluesec and reorganize security
c68218b
@VMSolidus
Adding prescription glasses
11c49a0
@VMSolidus
Update medical.yml
0c0cc24
@VMSolidus @DEATHB4DEFEAT
Apply suggestions from code review
d573549 
Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: VMSolidus <[email protected]>
@VMSolidus
Update MobReplacementRuleSystem.cs
68461a6
@VMSolidus
Update MobReplacementRuleSystem.cs
b2f4da6
@VMSolidus
Merge remote-tracking branch 'EE-Personal/FIX-MIMICS' into Sekrit-stuff
f5bfb93
@VMSolidus
Merge remote-tracking branch 'EE-Personal/Additional-Loadout-Items' i…
8763409 
…nto Sekrit-stuff
@VMSolidus
Merge remote-tracking branch 'EE-Personal/Harpy-Markings-Wave-2' into…
36d7208 
… Sekrit-stuff
@VMSolidus
Merge remote-tracking branch 'EE-Personal/Vendors' into Sekrit-stuff
862b26c
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jun 8, 2024 •
edited
Loading

RSI Diff Bot; head commit 1b8d149 merging into 8e423f1
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Mobs/Customization/Harpy/harpy_tailsx96.rsi

State Old New Status
peacock_tail_eyes Added
peacock_tail_feathers Added

Resources/Textures/Objects/Consumable/Drinks/bay_drinks.rsi

State Old New Status
(mdr)grapejuice Added
absinthebottle Added
alco-blue Added
alco-green Added
alco-red Added
alcoholfreebeer Added
alebottle Added
alecan Added
art_bru Added
badminka Added
baijiu Added
barflask Added
beastenergy Added
beer Added
beercan Added
bigteacup Added
bigteacup100 Added
blackstrap Added
bottleofnothing Added
broken Added
broken_bottle Added
bronze_cup Added
cachaca Added
ccola Added
champagne Added
coffee Added
cognacbottle Added
cola-blue Added
cola-brown Added
cola-green Added
cola-orange Added
cola-pink Added
cola-pork Added
cola-purple Added
cola-red Added
cola-yellow Added
cola Added
colabottle Added
coolant Added
cream Added
detflask Added
dnb Added
dr_gibb Added
energy_drink Added
fitness-cup_black Added
fitness-cup_blue Added
fitness-cup_red Added
flask Added
flavorpak Added
ginbottle Added
gingerbeer Added
golden_cup Added
goldschlagerbottle Added
grenadinebottle Added
hellshenbeer Added
herbal Added
holyflask Added
hrukhzaextract Added
ice_tea_can Added
ionbru Added
jar Added
jar_metroid Added
jar_what Added
kahluabottle Added
lager Added
lemon-lime Added
lemonjuice Added
limejuice Added
lithiumflask Added
lunabrandy Added
maplesyrup Added
milk Added
nothing Added
ocola Added
oil Added
orangejuice Added
patronbottle Added
pitcher Added
pitcher100 Added
pitcher15 Added
pitcher30 Added
pitcher50 Added
pitcher70 Added
pitcher85 Added
placeholder Added
premiumvodka Added
premiumwine Added
prosecco Added
purple_can Added
pwinebottle Added
rag Added
rag_lit Added
rag_small Added
rag_small_lit Added
rakia Added
ramen Added
rumbottle Added
sake Added
shaker Added
shinyflask Added
silver_cup Added
sodawater Added
soju Added
soymilk Added
space-up Added
space-up_bottle Added
space_mountain_wind Added
space_mountain_wind_bottle Added
starkist Added
syndi_cola Added
syndi_cola_x Added
tadmorwine Added
teapot Added
tequillabottle Added
thirteen_loko Added
thoom Added
tomatojuice Added
tonic Added
vacuumflask Added
vcola Added
vermouthbottle Added
vodkabottle Added
water Added
water_cup Added
water_cup_e Added
waterbottle Added
whiskeybottle Added
whiskeybottle2 Added
whiskeybottle3 Added
winebottle Added

Resources/Textures/Objects/Consumable/Drinks/milkmini.rsi

State Old New Status
icon Added
icon_open Added

Resources/Textures/Objects/Consumable/Drinks/milkminichoco.rsi

State Old New Status
icon Added
icon_open Added

Resources/Textures/Objects/Consumable/Drinks/shakerblack.rsi

State Old New Status
fitness-cup10 Added
fitness-cup100 Added
fitness-cup20 Added
fitness-cup30 Added
fitness-cup40 Added
fitness-cup50 Added
fitness-cup60 Added
fitness-cup70 Added
fitness-cup80 Added
fitness-cup90 Added
icon Added
icon_empty Added
icon_open Added

Resources/Textures/Objects/Consumable/Drinks/shakerblue.rsi

State Old New Status
fitness-cup10 Added
fitness-cup100 Added
fitness-cup20 Added
fitness-cup30 Added
fitness-cup40 Added
fitness-cup50 Added
fitness-cup60 Added
fitness-cup70 Added
fitness-cup80 Added
fitness-cup90 Added
icon Added
icon_empty Added
icon_open Added

Resources/Textures/Objects/Consumable/Drinks/shakerred.rsi

State Old New Status
fitness-cup10 Added
fitness-cup100 Added
fitness-cup20 Added
fitness-cup30 Added
fitness-cup40 Added
fitness-cup50 Added
fitness-cup60 Added
fitness-cup70 Added
fitness-cup80 Added
fitness-cup90 Added
icon Added
icon_empty Added
icon_open Added

Resources/Textures/Objects/Consumable/Food/bay_food.rsi

State Old New Status
0box-donut1 Added
0box-donut_chaos Added
1box-donut1 Added
1box-donut_chaos Added
2box-donut1 Added
2box-donut_chaos Added
3box-donut1 Added
3box-donut_chaos Added
4box-donut1 Added
4box-donut_chaos Added
4no_raisins Added
5box-donut1 Added
5box-donut_chaos Added
6box-donut1 Added
6box-donut_chaos Added
aesirsalad Added
aghrassh-cake Added
amanita_pie Added
amanitajelly Added
ancient_burger Added
ancient_fries Added
ancient_hburger Added
ancient_hotdog Added
ancient_pizza Added
ancient_taco Added
applecake Added
applecakeslice Added
applepie Added
bacon Added
badrecipe Added
baguette Added
bananabread Added
bananabreadslice Added
barbecue Added
bearmeat Added
beetsoup Added
berryclafoutis Added
bigbiteburger Added
birdmeat Added
birdsteak Added
birthdaycake Added
birthdaycakeslice Added
biscotti Added
bisque Added
boiledrice Added
boiledslimecore Added
brainburger Added
braincake Added
braincakeslice Added
bread Added
breadslice Added
bunbun Added
candiedapple Added
candy Added
candy_corn Added
carrotcake Added
carrotcake_slice Added
carrotfries Added
cereal_box Added
chawanmushi Added

Edit: diff updated after 1b8d149

@VMSolidus VMSolidus merged commit 25b9556 into SS14-Classic:master Jun 8, 2024
9 of 10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Changes: C# Changes: Localization Changes: Sprite Changes: YML
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@VMSolidus @Pspritechologist @DangerRevolution